inspector: Pass the renderer when recording

... and collect the profiler information from the renderer.

diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index 5ebb019bbc34346a600d6587bea1c0f4d0636034..b5c28d4594a67cfdf3ac3264dc59daf78fa1a78c 100644 (file)
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -15739,7 +15739,7 @@ gtk_widget_render (GtkWidget            *widget,
   if (root == NULL)
     return;
 
-  gtk_inspector_record_render (widget, window, region, root);
+  gtk_inspector_record_render (widget, renderer, window, region, root);
 
   context = gdk_window_begin_draw_frame (window, region);
 

diff --git a/gtk/inspector/recorder.c b/gtk/inspector/recorder.c
index 0d3a61bf9e7321022875ee2461e2f80e730a019c..455ec4a9ba0f803aec80d2f7dbd6125a8124a713 100644 (file)
--- a/gtk/inspector/recorder.c
+++ b/gtk/inspector/recorder.c
@@ -25,6 +25,7 @@
 #include <gtk/gtklistbox.h>
 #include <gtk/gtktreeselection.h>
 #include <gtk/gtktreeview.h>
+#include <gsk/gskrendererprivate.h>
 #include <gsk/gskrendernodeprivate.h>
 
 #include "gtktreemodelrendernode.h"
@@ -410,6 +411,7 @@ gtk_inspector_recorder_is_recording (GtkInspectorRecorder *recorder)
 void
 gtk_inspector_recorder_record_render (GtkInspectorRecorder *recorder,
                                       GtkWidget            *widget,
+                                      GskRenderer          *renderer,
                                       GdkWindow            *window,
                                       const cairo_region_t *region,
                                       GskRenderNode        *node)
@@ -423,6 +425,7 @@ gtk_inspector_recorder_record_render (GtkInspectorRecorder *recorder,
   frame_clock = gtk_widget_get_frame_clock (widget);
 
   recording = gtk_inspector_render_recording_new (gdk_frame_clock_get_frame_time (frame_clock),
+                                                  gsk_renderer_get_profiler (renderer),
                                                   &(GdkRectangle) { 0, 0,
                                                     gdk_window_get_width (window),
                                                     gdk_window_get_height (window) },

diff --git a/gtk/inspector/recorder.h b/gtk/inspector/recorder.h
index 557bb8c3f6161b3e1d8c0c749fdf75c4c984183d..676f3f16606df8f77cf6a00161260ee1f587a330 100644 (file)
--- a/gtk/inspector/recorder.h
+++ b/gtk/inspector/recorder.h
@@ -50,6 +50,7 @@ gboolean        gtk_inspector_recorder_is_recording             (GtkInspectorRec
 
 void            gtk_inspector_recorder_record_render            (GtkInspectorRecorder   *recorder,
                                                                  GtkWidget              *widget,
+                                                                 GskRenderer            *renderer,
                                                                  GdkWindow              *window,
                                                                  const cairo_region_t   *region,
                                                                  GskRenderNode          *node);

diff --git a/gtk/inspector/renderrecording.c b/gtk/inspector/renderrecording.c
index 761f5bdce9ee2d21e65c558b94a5b3289b15289f..f3bb0d1599e6f3e3adf2a1c02744c12abd0d891e 100644 (file)
--- a/gtk/inspector/renderrecording.c
+++ b/gtk/inspector/renderrecording.c
@@ -29,6 +29,7 @@ gtk_inspector_render_recording_finalize (GObject *object)
 
   g_clear_pointer (&recording->clip, cairo_region_destroy);
   g_clear_pointer (&recording->node, gsk_render_node_unref);
+  g_clear_pointer (&recording->profiler_info, g_free);
 
   G_OBJECT_CLASS (gtk_inspector_render_recording_parent_class)->finalize (object);
 }
@@ -46,8 +47,21 @@ gtk_inspector_render_recording_init (GtkInspectorRenderRecording *vis)
 {
 }
 
+static void
+collect_profiler_info (GtkInspectorRenderRecording *recording,
+                       GskProfiler                 *profiler)
+{
+  GString *string;
+
+  string = g_string_new (NULL);
+  gsk_profiler_append_timers (profiler, string);
+  gsk_profiler_append_counters (profiler, string);
+  recording->profiler_info = g_string_free (string, FALSE);
+}
+
 GtkInspectorRecording *
 gtk_inspector_render_recording_new (gint64                timestamp,
+                                    GskProfiler          *profiler,
                                     const GdkRectangle   *area,
                                     const cairo_region_t *clip,
                                     GskRenderNode        *node)
@@ -58,6 +72,7 @@ gtk_inspector_render_recording_new (gint64                timestamp,
                             "timestamp", timestamp,
                             NULL);
 
+  collect_profiler_info (recording, profiler);
   recording->area = *area;
   recording->clip = cairo_region_copy (clip);
   recording->node = gsk_render_node_ref (node);
@@ -83,4 +98,10 @@ gtk_inspector_render_recording_get_area (GtkInspectorRenderRecording *recording)
   return &recording->area;
 }
 
+const char *
+gtk_inspector_render_recording_get_profiler_info (GtkInspectorRenderRecording *recording)
+{
+  return recording->profiler_info;
+}
+
 // vim: set et sw=2 ts=2:

diff --git a/gtk/inspector/renderrecording.h b/gtk/inspector/renderrecording.h
index c9b14a19283a3e97d9127d2cac7bfbd2fd6c26cf..f84a87e609fe46cfa002dae59ab4245b3fd486b3 100644 (file)
--- a/gtk/inspector/renderrecording.h
+++ b/gtk/inspector/renderrecording.h
@@ -20,6 +20,7 @@
 
 #include <gdk/gdk.h>
 #include <gsk/gsk.h>
+#include "gsk/gskprofilerprivate.h"
 
 #include "inspector/recording.h"
 
@@ -42,6 +43,7 @@ typedef struct _GtkInspectorRenderRecording
   GdkRectangle area;
   cairo_region_t *clip;
   GskRenderNode *node;
+  char *profiler_info;
 } GtkInspectorRenderRecording;
 
 typedef struct _GtkInspectorRenderRecordingClass
@@ -53,6 +55,7 @@ GType           gtk_inspector_render_recording_get_type      (void);
 
 GtkInspectorRecording *
                 gtk_inspector_render_recording_new           (gint64                             timestamp,
+                                                              GskProfiler                       *profiler,
                                                               const GdkRectangle                *area,
                                                               const cairo_region_t              *clip,
                                                               GskRenderNode                     *node);
@@ -62,6 +65,8 @@ const cairo_region_t *
                 gtk_inspector_render_recording_get_clip_region (GtkInspectorRenderRecording     *recording);
 const cairo_rectangle_int_t *
                 gtk_inspector_render_recording_get_area      (GtkInspectorRenderRecording       *recording);
+const char *    gtk_inspector_render_recording_get_profiler_info
+                                                             (GtkInspectorRenderRecording       *recording);
 
 
 G_END_DECLS

diff --git a/gtk/inspector/window.c b/gtk/inspector/window.c
index beb0db9d31f279d928cd41bf2e7114a3e1ee64ac..b21f5c9842963f2b2525ca75c817b685579d7c8b 100644 (file)
--- a/gtk/inspector/window.c
+++ b/gtk/inspector/window.c
@@ -343,6 +343,7 @@ gtk_inspector_window_get_for_display (GdkDisplay *display)
 
 void
 gtk_inspector_record_render (GtkWidget            *widget,
+                             GskRenderer          *renderer,
                              GdkWindow            *window,
                              const cairo_region_t *region,
                              GskRenderNode        *node)
@@ -359,6 +360,7 @@ gtk_inspector_record_render (GtkWidget            *widget,
 
   gtk_inspector_recorder_record_render (GTK_INSPECTOR_RECORDER (iw->widget_recorder),
                                         widget,
+                                        renderer,
                                         window,
                                         region,
                                         node);

diff --git a/gtk/inspector/window.h b/gtk/inspector/window.h
index 0ca153d2cc4742dc4d6fe80b2a9e521bbe280cf6..671e759e0eaf8453b8a9eb025f97c6e54a839dc3 100644 (file)
--- a/gtk/inspector/window.h
+++ b/gtk/inspector/window.h
@@ -107,6 +107,7 @@ void       gtk_inspector_window_select_widget_under_pointer (GtkInspectorWindow
 void       gtk_inspector_window_rescan     (GtkWidget          *iw);
 
 void       gtk_inspector_record_render     (GtkWidget          *widget,
+                                            GskRenderer        *renderer,
                                             GdkWindow          *window,
                                             const cairo_region_t *region,
                                             GskRenderNode      *node);